don't know why this didn't commit

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index dbebb8970791739c37e7269a2afc31a718709c5e..68784a2b1620942d313d6a30e9a22661ac87cdd6 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1272,7 +1272,10 @@ gtk_cell_renderer_text_render (GtkCellRenderer    *cell,
     }
   else
     {
-      state = GTK_STATE_NORMAL;
+      if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
+       state = GTK_STATE_INSENSITIVE;
+      else
+       state = GTK_STATE_NORMAL;
     }
 
   if (celltext->background_set && state != GTK_STATE_SELECTED)

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 18a33630871e24e238dabd60c7865ff5a5342bfe..87c5dacf4a6d32bd0f0876e003fa3fd93e7f3141 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -695,7 +695,9 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
        {
          GtkWidget *toplevel = gtk_widget_get_toplevel (tree_column->tree_view);
          if (GTK_WIDGET_TOPLEVEL (toplevel))
-           gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
+           {
+             gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
+           }
        }
     }
 

diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index fd504f6d7b789c6509db1760f10b8d39a5a0e4a2..8cdcb116f64db5f2464e4d6862faf999571d9f48 100644 (file)
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -93,6 +93,7 @@ main (int argc, char *argv[])
   ssmodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (smodel));
 */
   tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
+
   /* 12 iters now, 12 later... */
   for (i = 0; data[i].word_1 != NULL; i++)
     {